Task/post develop merge fixes