some merge from jetbrains for android studio
to prev