vode changes for amber 0.12.6

inlining changes since last commited working version